Fix xm-test python import after XSM security changes.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/xm-test/lib/XmTestLib/acm.py b/tools/xm-test/lib/XmTestLib/acm.py
index 021aec048f1c07d0fe9f375d0c2b7771b869a16a..5456da6453c9f3796708d54e462d0b6517e8a22b 100644 (file)
--- a/tools/xm-test/lib/XmTestLib/acm.py
+++ b/tools/xm-test/lib/XmTestLib/acm.py
@@ -18,7 +18,7 @@
 
 """
 from Test import *
-from xen.util import security
+import xen.util.xsm.xsm as security
 from xen.xm.main import server
 from xen.util import xsconstants
 import re

diff --git a/tools/xm-test/tests/security-acm/01_security-acm_basic.py b/tools/xm-test/tests/security-acm/01_security-acm_basic.py
index a6af767fafebba71bfa75965b3e8dae5128a7714..26666f1faa3612902307c93e5b00f37300a6de5d 100644 (file)
--- a/tools/xm-test/tests/security-acm/01_security-acm_basic.py
+++ b/tools/xm-test/tests/security-acm/01_security-acm_basic.py
@@ -14,7 +14,7 @@
 # - resources
 
 from XmTestLib import *
-from xen.util import security
+import xen.util.xsm.xsm as security
 from xen.util import xsconstants
 import commands
 import os

diff --git a/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py b/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py
index d4d5eafdf77b666089f2f7ac5e5a09a351678117..a9e19a2153937381e322c027819ed154b35417c0 100644 (file)
--- a/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py
+++ b/tools/xm-test/tests/security-acm/07_security-acm_pol_update.py
@@ -9,7 +9,8 @@ from XmTestLib import xapi
 from XmTestLib.XenAPIDomain import XmTestAPIDomain
 from XmTestLib import *
 from xen.xend import XendAPIConstants
-from xen.util import acmpolicy, security, xsconstants
+import xen.util.xsm.xsm as security
+from xen.util import acmpolicy, xsconstants
 from xen.util.acmpolicy import ACMPolicy
 from xen.xend.XendDomain import DOM0_UUID
 from XmTestLib.acm import *

diff --git a/tools/xm-test/tests/security-acm/08_security-acm_xapi.py b/tools/xm-test/tests/security-acm/08_security-acm_xapi.py
index 7eafc3607bef22f348443b2d017cab2cb4b91a29..44e2fce0084fa74ea45029d95b29cfb740439f69 100644 (file)
--- a/tools/xm-test/tests/security-acm/08_security-acm_xapi.py
+++ b/tools/xm-test/tests/security-acm/08_security-acm_xapi.py
@@ -9,7 +9,8 @@ from XmTestLib import xapi
 from XmTestLib.XenAPIDomain import XmTestAPIDomain
 from XmTestLib import *
 from xen.xend import XendAPIConstants
-from xen.util import acmpolicy, security, xsconstants
+import xen.util.xsm.xsm as security
+from xen.util import acmpolicy, xsconstants
 import commands
 import os
 

diff --git a/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py b/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py
index fc3dab766435859485937a5bdaa7ef8cc29fdb3e..cc53baf2b9db77c4223467ca86040ff914656a81 100644 (file)
--- a/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py
+++ b/tools/xm-test/tests/security-acm/09_security-acm_pol_update.py
@@ -10,7 +10,8 @@ from XmTestLib.XenAPIDomain import XmTestAPIDomain
 from XmTestLib.acm import *
 from XmTestLib import *
 from xen.xend import XendAPIConstants
-from xen.util import security, xsconstants
+import xen.util.xsm.xsm as security
+from xen.util import xsconstants
 from xen.util.acmpolicy import ACMPolicy
 from xen.xend.XendDomain import DOM0_UUID
 import base64